Skip to content

feat(atemschutz): name a Trupp by Funkrufname and Trupp-Art - #769

Merged
DeepDiver1975 merged 1 commit into
mainfrom
feat/atemschutz-trupp-naming
Oct 25, 2026
Merged

DeepDiver1975 merged 1 commit into
mainfrom
feat/atemschutz-trupp-naming

Conversation

@DeepDiver1975

@DeepDiver1975 DeepDiver1975 commented Oct 25, 2026 •

Copy link
Copy Markdown
Contributor

Four change requests for the Atemschutz page, in one PR:

  1. Funkrufname: the FUNKRUFNAME box now suggests the call signs of the Kräfte entered for this Einsatz, whatever their Status, instead of every vehicle in the Stammdaten. Blank and duplicate call signs are dropped. The list updates when a Kraft is added, and it is replaced only when it actually changes (feat(atemschutz): model the Sicherheitstrupp instead of hoping for it #408). The box is still free text, so an ad-hoc or mutual-aid call sign can be typed (Unify call-sign input fields (AutoCompleteBox vs ComboBox split) into a reusable component #92).
  2. Benamung: a Trupp is now called {Funkrufname} · {Trupp-Art}, e.g. Florian Musterstadt 40/1 · Angriffstrupp, or just Angriffstrupp without a Funkrufname. This name is used in the grid, the banners, the ETB lines, the Sicherheitstrupp picker and the hint. TruppNumber is still stored and used for ordering, so there is no migration and no sync change. The name is computed rather than stored, so existing Einsatzdateien show the new form. ETB lines already written keep their text. DisplayNameWithCallSign is now the same as DisplayName, so it is removed.
  3. TRUPP column: 190 → 240px. The name wraps instead of being cut off, and the separate call-sign line goes away because the name now contains it.
  4. "Si." is written out as Sicherheitstrupp:
    • On screen, the label sits above the picker, and the picker's text is trimmed with a tooltip.
    • In the Bericht, the word would not fit unbroken in the 47pt Trupp column, so the Sicherheitstrupp moves to the full-width sub-line next to Status/Messreihe. The Trupp column prints the Trupp-Art alone, because Funkrufname already has its own column.

Two Trupps with the same Funkrufname and Trupp-Art now carry the same name; their grid rows are still separate.

Known, not changed here

At 1280px with the nav rail, the grid already scrolls sideways on main (AKTION is cut off; see the before shot). Atemschutz_grid_fits_without_scrolling_sideways measures ScbaView without the rail, so it doesn't catch this. The extra 50px for TRUPP makes the scroll 50px longer. Fixing it means rebalancing the columns, which deserves its own PR.

Screenshots

Before (1280px)
Before desktop

After (1280px)
After desktop

Before (phone) / After (phone)
Before phone After phone

Verification

  • make clean ci: 0 errors, all test assemblies passed, no Test Run Failed.
  • make format-check: clean.
  • make mutate SINCE=origin/main changed-line scores: Domain 100 %, Documents 100 %, AppLogic 91.7 %.

🤖 Generated with Claude Code

- Funkrufname suggestions are the Kräfte entered for the Einsatz, whatever
  their Status, instead of every vehicle in the Stammdaten. The box stays
  free text (#92).
- A Trupp is called "{Funkrufname} · {Trupp-Art}" everywhere: grid, banners,
  ETB lines, Sicherheitstrupp picker and Bericht. The running number stays
  stored for ordering only.
- The TRUPP column grows from 190 to 240px and the name wraps.
- "Si." is written out as "Sicherheitstrupp"; in the Bericht it moves to the
  full-width sub-line, where the word fits unbroken.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
@DeepDiver1975
DeepDiver1975 merged commit 3f3d64e into main Oct 25, 2026
14 checks passed
@DeepDiver1975
DeepDiver1975 deleted the feat/atemschutz-trupp-naming branch October 25, 2026 23:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant